From 4e33569110d9a4e71b1d2fa4ea674225c8d36b88 Mon Sep 17 00:00:00 2001 From: LogicParrot Date: Sun, 9 Oct 2016 18:22:34 +0300 Subject: Fixed cProjectileEntity double destroy bug (#3397) --- src/Entities/ProjectileEntity.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp index 2f90a56cb..fb7da85a1 100644 --- a/src/Entities/ProjectileEntity.cpp +++ b/src/Entities/ProjectileEntity.cpp @@ -413,6 +413,10 @@ void cProjectileEntity::HandlePhysics(std::chrono::milliseconds a_Dt, cChunk & a ); OnHitEntity(*(EntityCollisionCallback.GetHitEntity()), HitPos); + if (!IsTicking()) + { + return; // We were destroyed by an override of OnHitEntity + } } // TODO: Test the entities in the neighboring chunks, too -- cgit v1.2.3